Alpha 2 Merge